Minor fix for out of range entries