ticket:10 try to fix dups