Fix location, add substitute