Properly support message type CLEAR