diff --git a/src/RetrigAO.cpp b/src/RetrigAO.cpp
index f8993d0b3e92e0ed81cf342d5af42342e5b8f68b..d63e8761ad8113b5802d2d16cb23ea1933b11450 100644
--- a/src/RetrigAO.cpp
+++ b/src/RetrigAO.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.8 2006-11-24 10:04:56 abeilleg Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.9 2007-05-10 12:20:21 abeilleg Exp $";
 //+=============================================================================
 //
 // file :	  RetrigAO.cpp
@@ -13,9 +13,12 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
 //
 // $Author: abeilleg $
 //
-// $Revision: 1.8 $
+// $Revision: 1.9 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.8  2006/11/24 10:04:56  abeilleg
+// correction on bug zero forcing.
+//
 // Revision 1.7  2006/09/18 10:32:52  abeilleg
 // added internal software support.
 //
@@ -1275,7 +1278,8 @@ void RetrigAO::stop()
     "RetrigAO::stop",
     this->set_internal_state()
     );*/
-	this->stop_with_zero_forcing();
+	if(this->get_state() == Tango::RUNNING)
+		this->stop_with_zero_forcing();
 
 }
 //+------------------------------------------------------------------