whoops! fix avoid overlaps