fixed index and consumption validatio issues