Properly handle duplicated messages from the next epoch