Fixed repetitive message bug