Fixed for the new nodes