Update code to be compatible with the last version of Bender !