Fixed patch rejections introduced in the last commit