partial fix for mapping