Issue #263 fixed