fix exception with mapping