Checkpoint recovery: Double Global scope problem fixed