Fix for potential crash/freeze