bugfix with duplication