Fix following R66 interface changing