ensured existing stores are handled properly

no test because that's kinda cumbersome to do, it's late and I'm lazy