Patch issue with code rebase.