fix 217: Indexing doesn't discriminate scalars from singletons