Fix dupe glitch, break stack merging