Fix to work with new API response