Make it work with the latest version.