Issue #595 fixed.