fix for issue #285
Merge pull request #286 from m8ttyB/flaky

fix for issue #285