Try moving addon setup earlier