Fixed data values on items (Fixes #47)