Fixed API breakage