DAM-310: Nodes not refreshing properly