Changed order to fix tp bug