Fix merge issue, which resulted compilation error.