Fixed overlapping code.