fixed overriding map