Bugfix for 'new' indexer macro placement