Fix Message receive