fixed parse_message