Patch yet another annoying intermittent failure. [#54]