Duplication
Fixing issue #38