bugfix for mask passing w CBFs