Bug fix: Trigger wasn't getting latest state