Fix with new API