diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index f5837ca0e..240cac341 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -224,8 +224,7 @@ $request->{clienttype}->[0] = "cli";   # setup clienttype for auditlog
   my $massresponse="<massresponse>";
   my $nextcoalescetime=time()+1;
   my $coalescenow=0;
-  my $flags;
-  fcntl($client,F_GETFL,$flags);
+  my $flags=fcntl($client,F_GETFL,0);
   $flags |= O_NONBLOCK; #select can be a bit.. fickle, make sysread work more easily...
   fcntl($client,F_SETFL,$flags);
   my $clientsel = new IO::Select;
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 87f8c85b3..c593b6f5f 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1687,8 +1687,7 @@ sub service_connection {
     my $request;
     my $req=undef;
     my $line;
-    my $flags;
-    fcntl($sock,F_GETFL,$flags);
+    my $flags=fcntl($sock,F_GETFL,0);
     $flags |= O_NONBLOCK; #we want sysread to bail on us, select seems to be evil to us still..
     fcntl($sock,F_SETFL,$flags);
     my $clientsel = new IO::Select;