Fix issues with fetching the fixture data