Another configuration load / reset bug fix