Fix incompatibility with 6.0 interface