Fixing crash #Crittercism 98b5b02b6c19f700f8eda8df34ff15bd91eec97fca8ca8aeb9ea78df