Comment by kigiri

Also this works on node too now, don't sleep on node improvements