Moved out of the handler again.