Add underscore map to fix bug

Add underscore map to fix bug