Fixed issue with no store