Bugs fixed on multiple row