Fix changed underlying API