Fix scalar returning None