API change #264