Modify time unit judgement to consider the time variable that doesn't have name 'time'. See merge request !185