unify behavior in different collections in Mapper
fix exception