Comitting potential fix to TP