[#415] Fixed wrong map picked up
Merge pull request #450 from akvo/issue/415

[#415] Fixed wrong map picked up