Issue #181 fix NODEMO issue