Fix StoreManager