Core/maps: Fix 06d7fff.

(cherry picked from commit 2316608d27be15118e1c5aa40c8facf88a56365c)