fix for mapping changes