Fixed someOf
Fixed someOf