Fix some parse error for 6.0.2