fixed duplication error introduced with rebase