Now scalars are properly handled.