case matching fixes