Fixes #136 Achilles is consuming too many resources