Fix for multiple/single node