Fixed two bugs related to I