Fixed  global var hardocoded in Common