fixed problems with thomas