One more fix to remove the for-node API