fixed duplication bug
Merge branch 'hotfix-0.3.3' into develop