fixed freeze/unfreeze