fixed one-2-many mapping