Adapted to be compatible with 4.4-release.