fixes #1734
cleaning things a bit, see #1734
Merge pull request #56 from aabadie/1734_item_reset_bug

fixes #1734