Issue #11 correcting code