Bug fix for legacy data mapping