Make it work with latest sorcery