Bugfix, duplicate then