Fix case handling for 2i - #115