Fixed doubled messages