Patch from Giovanni: