Issue #1759 was partially fixed.