Fixed time scale bug