Add NaN tp back to avoid being stuck