add isAdded check