This should fix the intermittent failures, thanks to @pollo for the tip
mentioned in issue #67 (closed)