Fixxed another message remove bug