Fix ModeT

A new day, a new attempt at fixing ModeT :-) This time without any other code around it.