Issue #563 fixed