Fix trade/use bug from previous commit