Fix item index and upper() method