fixed huge dupe bug