Issue #568 fixed.