Issue #427 fixed