Added fix for broken ::map