Fixed overlapping pin bugs