@xiangli-cmu I could keep both flags work now. Is that a reasonable solution for now?