Fixed bug duplicate