Replaced range for #630