Fixes handler calling