Fix issue with data challenges