Fork : Fix building issue introduce on wrong merge conflict.