[#415] Fixed wrong map picked up