Fix issue #386 - base over patch from Milan Crha: