Use origin master branch's fix