Fixed for FindNode