Propagate correctly scalar type