Fix bug with removing child entities