Bug fix for handlers.