Second try at fixing the partner trigger