[WARWAR] - fix with the new API