Bug fixing on one-to-X and X-to-one relations.