Fix pulling out items, closes #1