patched issue10, not topic with line 516 yet