Time fix #1