Modify f0e6f70 to avoid reference to out of range