Make it not crash on Haiku
Merge pull request #1 from puckipedia/master

Make it not crash on Haiku