fixed dup bug