Test and fix for Issue #855

See discussion on issue...