Fixed small issue in backport