FIX for bug when @{upstream} was not resolving