Fixed Configuration saving issue