Issue #1761 was partially fixed. Without tests.