Fix issue 1120 by correcting reconfigure and futureproof similar cases.