Minor fix, if saved stack sessions are a different length than original
Merge branch 'stack-swap'

* stack-swap:
  Minor fix, if saved stack sessions are a different length than original