Bugs Fixed on multiple row