That should fix the handler