Second tentative to make localization work