modify the handler