Added fix from mreitveld to mock data.