Time fix #2