Fixed Double Message Bug