Bugfix for indexed and indexedSync