Fixed Duplication Issue