maybe fixed dusplicat message remove