fixed list out of bounds
Merge remote-tracking branch 'origin/master'
fixed list out of bounds