#1635 bugfix map