Fix another handlers bug