Fixing for newer API.