Fix container bug (remove control by index)