Address critical vulnerability for Mapper