Fix lost commit from merge

Applies to pr#226
Fix the fix

Applies to #226
Merge pull request #229 from Martii/followupPR226

Followup pr226