crash fixed

-hot fix for the crash that was caused by new code