Bug897748

Addresses bug #897748.