Fixed sending same message twice