dev+: crash fix
tst+