fixed duplication - Mr. B