quick bug fix: s/message/ns_message/g