Fix shops getting cleared on load [ticket 42]