Bugfix for nodeId and Demo Code