fixed index issue