Fix Issues with case sensitive