Fixed for issues with recovering nodes