Fix the merge from 59535497aa
Merge pull request #1 from hawkrives/patch-1

Fix the merge from 59535497aa