Bugs fixed on multiple rows