freezing-bugfixes