Fix to predefine variable name