move handler to the right location