Fix problem with first checkout