diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index d59a3407b..4fe1e79f7 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -235,12 +235,15 @@ class PreferenceController extends Zend_Controller_Action
                 $changeRGenabled = Application_Model_Preference::GetEnableReplayGain() != $values["enableReplayGain"];
                 $changeRGmodifier = Application_Model_Preference::getReplayGainModifier() != $values["replayGainModifier"];
                 if ($changeRGenabled || $changeRGmodifier) {
+                    Application_Model_Preference::SetEnableReplayGain($values["enableReplayGain"]);
+                    Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]);
                     $md = array('schedule' => Application_Model_Schedule::getSchedule());
                     Application_Model_RabbitMq::SendMessageToPypo("update_schedule", $md);
                 }
                 
                 Application_Model_Preference::SetEnableReplayGain($values["enableReplayGain"]);
                 Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]);
+
                 Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']);
 
                 // store stream update timestamp
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 8f285e86a..1bf8a8de8 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -378,6 +378,8 @@ SQL;
         $row->setDbCliplength($info["cliplength"]);
         $row->setDbCuein($info["cuein"]);
         $row->setDbCueout($info["cueout"]);
+        $info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]);
+        $info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]);
         $row->setDbFadein($info["fadein"]);
         $row->setDbFadeout($info["fadeout"]);
         $row->save($this->con);
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 2cd0050ab..c822ba802 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -348,6 +348,8 @@ SQL;
         $row->setDbCliplength($info["cliplength"]);
         $row->setDbCuein($info["cuein"]);
         $row->setDbCueout($info["cueout"]);
+        $info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]);
+        $info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]);
         $row->setDbFadein($info["fadein"]);
         $row->setDbFadeout($info["fadeout"]);
         if ($info["ftype"] == "audioclip") {