Make Time be resolved sooner