Fixing TimeOverlap