kwargs fix in maps