Fixed time overlap error