Session: Fix trigger handling