replace one to many fix