Issue #565 fixed.