Issue #551 fixed