Fix for double timestamps