Fix epoch checking
3 files changed