Fix the merge issue from 4.0.2