Fix for duplication messages on connect 1