Fix dupe bug

Meh the other commits shouldnt break anything, im abit drunk thoigh.