quick fix for mapping