Issue #1804 test failure was fixed.