Fixes #153 (Shop Bug 2#)