extract_message_op fix