Fix for handlers not being found when case getting mixed up