Saving fixed

Closes #15