Fix scope assistant