Fix order of handlers