Fix trepidity's fix for #41
Merge pull request #1 from cweiske/fix41

Fix trepidity's fix for #41