Update the patch with advices from Jinho Kim.