use a pre-declared variable
merge in the fix branch