Bug fix for store front