Fix inconsistent machine stacking