Fix for a crash