Fix bug where save wasn't working.
Merge branch 'gl/fix-save' into gl/ivs-2