Fixed adding overlapping entities in "no overlap" mode