Issue #254 somewhat fixed.