More attempts at fixing time