[#79692868] last fix - for real

this should solve all remaining
build edge case problems