Time fix
Time fix 2