Fixed overlapping entities. Issue #90