Fixed global constants bug