diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb
index 0f71d85c..72a59ce3 100755
--- a/app/controllers/settings/dining_charges_controller.rb
+++ b/app/controllers/settings/dining_charges_controller.rb
@@ -17,7 +17,7 @@ class Settings::DiningChargesController < ApplicationController
   def new
     @dining_charge = DiningCharge.new
     @dining_charge.minimum_free_time = "00:15:00".to_datetime
-    @dining_charge.charge_block= "02:00:00".to_datetime
+    @dining_charge.charge_block= "01:00:00".to_datetime
     @dining_charge.time_rounding_block="00:15:00".to_datetime
   end
 
@@ -54,6 +54,9 @@ class Settings::DiningChargesController < ApplicationController
   def update
     respond_to do |format|
       @dining_charge.dining_facility_id = @settings_dining_facility.id
+      @dining_charge.minimum_free_time = DateTime.parse(dining_charge_params["minimum_free_time"])
+      @dining_charge.charge_block = DateTime.parse(dining_charge_params["charge_block"])
+      @dining_charge.time_rounding_block = DateTime.parse(dining_charge_params["time_rounding_block"])
       if @dining_charge.update(dining_charge_params)
         # @dining_charge.minimum_free_time = @dining_charge.minimum_free_time.to_datetime.advance(hours: +6, minutes: +30)
         # @dining_charge.charge_block = @dining_charge.charge_block.to_datetime.advance(hours: +6, minutes: +30)
diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb
index 6eddbad4..555ba168 100755
--- a/app/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -46,7 +46,7 @@ class DiningCharge < ApplicationRecord
           # no time rounding block
           return result.to_i, DiningCharge.check_rounding(chargesObj, solid_price, roundingblock)
        else
-          solid_price += roundingblock * chargesObj.time_rounding_block_price
+          solid_price += (roundingblock * chargesObj.time_rounding_block_price)
           return result.to_i, DiningCharge.check_rounding(chargesObj, solid_price, roundingblock)         
        end
     end