Adapted to the latest compiler version.