Fixed for true current time calculation