case 2071 - Better trigger handling.