Fix for maps in vendors