#316 part + avoid CA0064