Fixed handler re-entries