Fix/move message handling.