bug fix index out of range