fix for current api