Fix incompatibility