Fix after interface change