#115 make use of modified @indexed semantics