Fixed message appearing twice bug