Another fix for trade exploit (hopefully the last: Fixes #1408)