Should file another patch to fix the Line 122 and Line 139.