fix compilation error after the merge from master