I have no idea if this will address #240, as I cannot reproduce the issue reliable, but here is a go...