Fix for trigger change