Fixed cherry-picking error