Made more robust with case matching