fix end of first row
Use better doRange and endRange