Fix someof build
(cherry picked from commit 4dc91fc)