diff --git a/contracts/eosiolib/dispatcher.hpp b/contracts/eosiolib/dispatcher.hpp
index 3c55aa52219a03fbdb46920cd90b8e7b94d62ee7..4c72a145f6409171394fe5defeb8eb018e5f494b 100644
--- a/contracts/eosiolib/dispatcher.hpp
+++ b/contracts/eosiolib/dispatcher.hpp
@@ -66,7 +66,7 @@ namespace eosio {
 #define EOSIO_API_CALL( r, OP, elem ) \
    case ::eosio::string_to_name( BOOST_PP_STRINGIZE(elem) ): \
       eosio::execute_action( &thiscontract, &OP::elem ); \
-      return;
+      break;
 
 #define EOSIO_API( TYPE,  MEMBERS ) \
    BOOST_PP_SEQ_FOR_EACH( EOSIO_API_CALL, TYPE, MEMBERS )
@@ -80,7 +80,7 @@ extern "C" { \
          switch( action ) { \
             EOSIO_API( TYPE, MEMBERS ) \
          } \
-         eosio_exit(0); \
+         /* does not allow destructor of thiscontract to run: eosio_exit(0); */ \
       } \
    } \
 } \