Issue #585 fixed (Companion stack overflow on Windows, already fixed on
SVN)