fix for store issue