Post saving logic fix - fixes #2 fixes #3