Changed to include FragmentLocator