Fix for multi epoch