Issue #1913 was partially fixed.