Patch fixing the problem