Store store wasn't being correctly unloaded