Issue #667 fixed