Fixup: Merge two checks into one