Fix mistake when merging with Phuc02_10 branch