Initial time bug fix