Fix double creation on new items