fixing bugs for stacking on a fresh machine