Use the Popup trick to fix most TS errors. #2

Use the Popup trick to fix most TS errors. #2 #99