Fix TM2 Alpha again

Need to test and make sure this didn't break TM1. Should otherwise be solid, though.