0336: restore missing parts in triggers