Bug #2897

Closes Bug #2897