Fixing static branch to work like the node one