Fix StoreFactory issue