squashing my mistakes - fixes locators