Comment #TP-1 Fixed