Adding fix for shop