epop timestamp bug fix