Fixed problems with TimeUtils