Fixed select partner as partner too