fix timestamp fetching