Fixes ItemList handling