Reimplemented r6871 from /branches/modified-shop-1.06-SP3 in /branches/modified-shop-1.06-SP4 which was accidentally overwritten in r8930