Issue #1684800: Followup to prevent variable not found error.