TRIGGER fix + update