Fix double-adding items bug