Fixed #16 for items