Merge pull request #2838 from junmendoza/defectfix

Testcase for CBN copy and paste