Fixing wrong order of handlers.