fixed issue with duplicate picks