Issue #1 corrected