A fix for the "freezing" problem .....