fix issues saving and getting