fix wrong index #9
add ut #9 #54