Disclosed is a method of preparing a hair conditioning composition, wherein the composition comprising a cationicsurfactant, a high melting point fatty compound, and a polyol having a molecular weight of from about 40 to about 500, and wherein the method comprises a step of mixing the cationicsurfactant system, high melting point fatty compound, and polyol, to form an emulsion. The composition preferably further comprises an aqueous carrier, and the aqueous carrier is preferably mixed with other ingredients to form an emulsion.