Fix for redundant timestamps