Fixed nesting for current goal