Remove the one row to many, now correctly