Change message type, fix