Fixing evaluation index bug