Second part of fix for #35
Merge pull request #37 from dekkers/fix-35-second-part

Second part of fix for #35