Issue #615 fixed