Better trade handling
Fixed stupid