Handle UPPERCASE constants, bugfix