fix for TP-16