Small fix for 4540 in empty maps
Merge pull request #4739 from jlarouche/4540-fix2

Small fix for #4540 in empty maps