Fix back compatibility in new version.