Issue #763 Bug fix