Fix for duplication messages on connect