Fix for freezing with noise