There are mitigations but I'm not aware of an ironclad fix.
When thinking about these risks it helps to do a little thread modeling: What specifically do I want to protect? Who might threaten it? What specifically might they do?
A corporate network can help prevent wifi MITM from an outsider by using MAC filtering and the Enterprise variants of WPA/WPA2. That's too onerous for public networks or most smaller orgs.