resolve FC022
Resolve FC003
change variable name