Merge pull request #518 from annando/item-isolation