some more safeguwards against time losses