Modify trigger. Closes #2324, #2323