Time edits fix