Any reason for re-adding the handler here?