Really fix carbon compatibility this time