Is there a patch for this issue?