Didn't fully apply diff for pull request #12

This should fix it.