fix new API