Fix build

(cherry picked from commit a724247dc978fafe62bb88237999832bb46574cc)