Changed order of handlers