Gooberries: The Freeze Patch Continues.

Another attempt at fixing freeze issues.