Fixed removeAtIndex issue