#75 keep reference to item data instead of relying on