Re: #5926: Mismatch after adding epoch