fixed index definition issues