Fix freeze Bug