Goods bug fix