Trigger - nesting fix