Fixing double message bug