Temporary Fix for Crash