fix
Merge pull request #542 from woodee/patch-18

fix