Case folding problem fix