Fixing for upcoming breaking changes.