Merge pull request #76 from nico/fix

Fix build on some systems after #75.