Comment #TP-2 Fixed