Fix leeches
Merge pull request #540 from timrae/fixLeeches

Fix leeches