Fixing #5 (freezing warning)