Time fix #5