Thomas sorts it out