diff --git a/src/ezfio-tail.py b/src/ezfio-tail.py
index 63e6e62..807bf35 100644
--- a/src/ezfio-tail.py
+++ b/src/ezfio-tail.py
@@ -55,8 +55,11 @@ def main():
       return 0
 
   elif command.startswith('set'):
+      text = sys.stdin.read()
       try:
-          data = eval(sys.stdin.read())
+          data = eval(text)
+      except NameError:
+          data = text
       except:
           print "Syntax Error"
           return 1
diff --git a/src/libezfio_util.irp.f b/src/libezfio_util.irp.f
index dadc34b..b5a9491 100644
--- a/src/libezfio_util.irp.f
+++ b/src/libezfio_util.irp.f
@@ -172,7 +172,7 @@ subroutine ezfio_write_%(type_short)s(dir,fil,dat)
   open(unit=libezfio_iunit,file=l_filename(1),form='FORMATTED',action='WRITE')
   write(libezfio_iunit,%(fmt)s) dat
   close(libezfio_iunit)
-  call system( 'mv -f '//trim(l_filename(1))//' '//trim(l_filename(2)) )
+  call rename(trim(l_filename(1)),trim(l_filename(2)) )
 end
 
 subroutine ezfio_read_array_%(type_short)s(dir,fil,rank,dims,dim_max,dat)
@@ -268,7 +268,7 @@ subroutine ezfio_write_array_%(type_short)s(dir,fil,rank,dims,dim_max,dat)
     call libezfio_closez(trim(l_filename(1)),'w')
     deallocate(buffer)
   endif
-  call system( 'mv -f '//trim(l_filename(1))//' '//trim(l_filename(2)) )
+  call rename(trim(l_filename(1)),trim(l_filename(2)) )
 end
 """