fixed duplication of messages