Fixed for wrong rows