unbroke non-minimal t2s mode