Added an extra check for TP2 types