fixed duplication