diff --git a/maca_trans_parser/src/feat_fct.c b/maca_trans_parser/src/feat_fct.c
index b0565505ea9ab0b69ef430114ecb95819d0e92f2..f8277fb468cc2e11408c6baf0e5ac5a4139372dc 100644
--- a/maca_trans_parser/src/feat_fct.c
+++ b/maca_trans_parser/src/feat_fct.c
@@ -178,8 +178,8 @@ int b0sf(void *c) {return word_get_label(word_buffer_b0(config_get_buffer((confi
 int b0len(void *c) {
   int len = 0;
   word *w = word_buffer_b0(config_get_buffer((config *) c));
-  if(w->input)
-    len = strlen(w->input);
+  if(w && w->form)
+    len = strlen(w->form);
   return (len > 7)? 7 : len;
 }
 
diff --git a/maca_trans_parser/src/maca_tm_mcf2scf.c b/maca_trans_parser/src/maca_tm_mcf2scf.c
index d243d369ba9cdc5eba93f0bda968900a2913d6fa..dde64beb1868f0e05c0e94d6e7970b193e800f84 100644
--- a/maca_trans_parser/src/maca_tm_mcf2scf.c
+++ b/maca_trans_parser/src/maca_tm_mcf2scf.c
@@ -142,6 +142,8 @@ void generate_scf_file(context *ctx)
       exit(1);
     }
     mvt_type = mvt_tagset_get_type(classifier_get_output_tagset(classif), mvt_code);
+
+    //    mvt_tagset_print_mvt(stdout, classifier_get_output_tagset(classif), mvt_code); printf("\n");
     config2feat_vec_cff(classif->fm, c, classif->d_features, classif->fv, ctx->mode);
 
     if(ctx->debug_mode){
diff --git a/maca_trans_parser/src/mvt_tagset.c b/maca_trans_parser/src/mvt_tagset.c
index 9bf8d500e0a0a6d47e8e6b8ce2650758e750254e..c9fae9b91a8b0dac0c2e86832fb6670d768cc2ea 100644
--- a/maca_trans_parser/src/mvt_tagset.c
+++ b/maca_trans_parser/src/mvt_tagset.c
@@ -27,8 +27,10 @@ int mvt_tagset_get_type(mvt_tagset *t, int code)
 {
   int i;
   for(i=0; i < MVT_TYPES_NB; i++){
-    if((t->start[i] <= code) && (code <= t->end[i]))
+    if((t->start[i] <= code) && (code <= t->end[i])){
       return i;
+
+    }
   }
 
   fprintf(stderr, "cannot find a type for movement code = %d\n", code);