diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index b544f5f17..1fbd50ef5 100644
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -31,7 +31,7 @@
   require_once ( "classes/model/AppDocumentPeer.php" );
 
   $oAppDocument = new AppDocument();
-  $oAppDocument->Fields = $oAppDocument->load($_GET['a'],isset($_GET['v']) ? $_GET['v'] : NULL );
+  $oAppDocument->Fields = $oAppDocument->load($_GET['a'],(isset($_GET['v']) )? $_GET['v'] : NULL );
 
   $sAppDocUid = $oAppDocument->getAppDocUid();
   $info = pathinfo( $oAppDocument->getAppDocFilename() );
@@ -46,8 +46,10 @@
   		$ext = $info['extension'];
   	}
   }
-  $ver= (isset($_GET['v']) && $_GET['v']!='') ? '_'.$_GET['v'] : '';
+$ver= (isset($_GET['v']) && $_GET['v']!='') ? '_'.$_GET['v'] : '';
+//$var = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $sAppDocUid .$ver. '.' . $ext;
+
   $realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $sAppDocUid .$ver. '.' . $ext ;  G::streamFile ( $realPath, true );
- // G::streamFile ( $realPath, true ,$info['basename'] .$ver. '.' . $ext );
- G::streamFile ( $realPath, true);
+  G::streamFile ( $realPath, true ,$info['basename'] .$ver. '.' . $ext );
+ //G::streamFile ( $realPath, true);
 ?>
\ No newline at end of file
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index b88e6f492..31015367d 100644
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -324,7 +324,7 @@
 					//END: If there is a Break Step registered from Plugin
 
 
-
+          $sFilename = ereg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
           require_once 'classes/model/AppFolder.php';
           require_once 'classes/model/AppDocument.php';
 
@@ -354,6 +354,7 @@
           $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
           $oDataset->next();
           if(($aOD['OUT_DOC_VERSIONING'])&&($lastDocVersion!=0)){//Create new Version of current output
+            $lastDocVersion++;
             if ($aRow = $oDataset->getRow()) {
                 $aFields = array('APP_DOC_UID'         => $aRow['APP_DOC_UID'],
                                  'APP_UID'             => $_SESSION['APPLICATION'],