Crashfix

Crashfix on Access to an out-of-bounds register-index