fix for handlers