Another fix to Issue #10.