Fix to limit the number of get message for reverting message