Make it work with latest master