Fix to work with last night's build