fix for api changes.