Fixed message doubling