fixed for new API