Fix for nodes