Issue #463 partially fixed