Fix regression for fix to Issue #7