Fix issue with case compare