3.16: update for fencepost error