Fixed some dupe bug