Fix issues with /FitR destinations
Merge pull request #3955 from Snuffleupagus/issue-3953

Fix issues with /FitR destinations