Fix for current version of Bender