Fix removing of items