bug fix: changed raw_msg to @raw_msg