Fixing Saves

Helping fix #149