issue #3471 add map