Bugfix in index_one