Fix findorcreate issue