Migration fix for data module