protect against out of bounds read
Merge remote-tracking branch 'origin/pn_multiback' into kk_multiback