Fixed partner creation