small fix and make items be only contained in themselve