no longer crashes in shop