Fix case sensitive part 2 .........