define MARCO variable
fixed 2 bug