Fix One to Many with no many result returned