Handle the scalar values a bit better