Fixed minor rebase issue