Fix issue #384, patch from Milan Crha: