Issue #443 fixed