Hacked a fix for maps