Fixed first Row problem