changes to fix to pass tests
Merge pull request #156 from optopus/fix-node-saving

changes to fix to pass tests