diff --git a/C4/Circulation/Returns.pm b/C4/Circulation/Returns.pm
index 33534ff..4d9a65f 100755
--- a/C4/Circulation/Returns.pm
+++ b/C4/Circulation/Returns.pm
@@ -73,15 +73,16 @@ sub Returns {
       ($reason,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = checkissue($env,$dbh,$item);
       if (($reason ne "") && ($reason ne "Circ")  && ($reason ne "Quit")) {
         if ($reason eq "Returned") {
-	my $fmtitem = fmtstr($env,$itemrec->{'title'},"L50");
-           unshift @items,$fmtitem;
+	  my $fmtitem = fmtstr($env,$itemrec->{'title'},"L50");
+       	  unshift @items,$fmtitem;
 	  
-	} else {
-          error_msg($env,$reason);
+  	} else {
+            error_msg($env,$reason);
 	}
       }
     }
   }
+  clearscreen;
   $dbh->disconnect;
   return($reason);
   }
@@ -95,31 +96,34 @@ sub checkissue {
   my $itemrec;
   my $amt_owing;
   $item = uc $item;
-  my $query = "select * from items where barcode = '$item'";
+  my $query = "select * from items,biblio 
+    where barcode = '$item'
+    and (biblio.biblionumber=items.biblionumber)";
   my $sth=$dbh->prepare($query); 
   $sth->execute;
   if ($itemrec=$sth->fetchrow_hashref) {
      $sth->finish;
-     $query = "select * from issues where
-       (itemnumber='$itemrec->{'itemnumber'}') and (returndate is null)";
+     $query = "select * from issues
+       where (itemnumber='$itemrec->{'itemnumber'}')
+       and (returndate is null)";
      my $sth=$dbh->prepare($query);
      $sth->execute;
      if (my $issuerec=$sth->fetchrow_hashref) {
-     $sth->finish;
-     $query = "select * from borrowers where
-     (borrowernumber = '$issuerec->{'borrowernumber'}')";
-     my $sth= $dbh->prepare($query);
-     $sth->execute;
-     $borrower = $sth->fetchrow_hashref;
-     $bornum = $issuerec->{'borrowernumber'};
-     $itemno = $issuerec->{'itemnumber'};
-     $amt_owing = returnrecord($env,$dbh,$bornum,$itemno);     
-     $reason = "Returned";    
+       $sth->finish;
+       $query = "select * from borrowers where
+       (borrowernumber = '$issuerec->{'borrowernumber'}')";
+       my $sth= $dbh->prepare($query);
+       $sth->execute;
+       $borrower = $sth->fetchrow_hashref;
+       $bornum = $issuerec->{'borrowernumber'};
+       $itemno = $issuerec->{'itemnumber'};
+       $amt_owing = returnrecord($env,$dbh,$bornum,$itemno);     
+       $reason = "Returned";    
      } else {
        $sth->finish;
        $reason = "Item not issued";
      }       
-  } else {
+   } else {
      $sth->finish;
      $reason = "Item not found";
   }   
diff --git a/C4/Interface.pm b/C4/Interface.pm
index 86f2c4f..5edd37e 100755
--- a/C4/Interface.pm
+++ b/C4/Interface.pm
@@ -174,7 +174,7 @@ sub returnwindow {
   my $la1      = Newt::Label("Total Amount");
   my $fee      = Newt::Label(fmtdec($env,$amountowing,"$32"));
   my $l1       = Newt::Label("Returned"); 
-  my $li1      = Newt::Listbox(15,NEWT_FLAG_SCROLL | NEWT_FLAG_BORDER);
+  my $li1      = Newt::Listbox(13,NEWT_FLAG_SCROLL | NEWT_FLAG_BORDER);
   my $i = 0;
   while ($items->[$i]) {
     $li1->Add($items->[$i]);