Fix for not clipping message type in sync_on_message