Corrections because of possible array-bound violation
Authored by: arjenmarkus 2021-03-22
Parent: [r427]
Child: [r429]
