Issue #1899 - initial fix.