Merge pull request #1405 from nabinhait/hotfix

Serial No duplicate entry fix