one-to-many mapping fix