Fixes #1 - My First Fix