Mesage service bug fix!