fixed issues from previous commit - related to messages