Fixed what pull request #6 was intending to fix