Issue #426 fixed