Fix to widget map