Fixed upper case compatibility