fixed duplication issue