Yet another fix for tp'ing. (PROMISE it'll work O.o)