mid term fix for legacy data