Applying the same functionality to Tassadar's time fix.