I guess this comment refers to code at line 408 and should be move below?