Fix analysis fault on #18