Fixed commented global variables issue