bug-fix with time-units