Fix it for new API