Merge pull request #1194 from zmallen/magicnumberfix

Magicnumberfix