fixed index out of range errors