misc: more stability