Fixing Issue 05

Hello, this pull request is to fix issue 05.