Fix for partner trigger, untested.