Fix the index/alias distinction