Probably fix save bug