Issue #4 corrected