Workaround next problem with MSAN and amend previous comment