Fixup Using $scope instead of $rootScope to avoid lingering $watch issue