change resolve mappings behavior