Another try at fixing the time..