Time fix #3