Issue2635

PR to review the test and fix for #2635