Attempted fix for node 6/8