add a comment and simplify upstream check