Patch from Krzysztof Blaszkowski: