fixes the  global variable
fixes conflicts