[#79692868] last fix

this should solve all remaining
build edge case problems