Adding fix to not return entire bucket at root node
++version - 0.16.6