Make it work with new versions