Fixes timestamp bug