better handling of possible MT problems