Fix/move handler.