fix to Issue #1