tweak the handler back