Time fix #6