Fixed geometry use on-the-fly instead of on checkin