Fix #6661 - modify hooks to update timeshetet