Fix TP and Restrain