fix duping problem