fix Mappings to works well