4.4.4_r1 error fix