PR Fixup Fixup: get logic right