Fix for repeatedly receiving the same messages