temp fix to time recalc issues