better handling of uppercase