fixed index stuff