enhanced trigger consistency