fix somw issues

fixed issue of duplicating