fixed index mess.