Fixed Duplication Bug