fixed duplicated messages, (dirty hack)