Time Editor fix