update
make same codepath work for client and node
1.3.5