Store save bug squished