Fix for duplicate timestamps