Avoided ABI breakage