Bug hunting of the last commit
Bug fix of commit 0e00aafb4f599a3d729c12a55d3bb19d98f7132e (node compatibility)