safer handling around the suffix, was causing suffixless builds to fail