Fixed starting_loc issue