[fixed] fishing out of bounds exceptions

Change-Id: I48e0f6effb69da8b0f6ade740558a57a9818afa9
Merge "[fixed] fishing out of bounds exceptions" into unstable