Patch file for issue 3805