Fix bug with not preserving the original entity objects in a Collection upon validating the form