Fix for locator TESB-9056