Issue #566 fixed