diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 49d38cba2..54840cae6 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -561,7 +561,7 @@ class ApiController extends Zend_Controller_Action
 
         $request = $this->getRequest();
         $api_key = $request->getParam('api_key');
-        $path = realpath(base64_decode($request->getParam('path')))."/";
+        $path = base64_decode($request->getParam('path'));
         
         if (!in_array($api_key, $CC_CONFIG["apiKey"]))
         {
@@ -578,7 +578,7 @@ class ApiController extends Zend_Controller_Action
 
         $request = $this->getRequest();
         $api_key = $request->getParam('api_key');
-        $path = realpath(base64_decode($request->getParam('path')))."/";
+        $path = base64_decode($request->getParam('path'));
         
         if (!in_array($api_key, $CC_CONFIG["apiKey"]))
         {
@@ -595,7 +595,7 @@ class ApiController extends Zend_Controller_Action
 
         $request = $this->getRequest();
         $api_key = $request->getParam('api_key');
-        $path = realpath(base64_decode($request->getParam('path')))."/";
+        $path = base64_decode($request->getParam('path'));
         
         if (!in_array($api_key, $CC_CONFIG["apiKey"]))
         {
diff --git a/airtime_mvc/application/models/MusicDir.php b/airtime_mvc/application/models/MusicDir.php
index 30d5d06d9..54c27f4b7 100644
--- a/airtime_mvc/application/models/MusicDir.php
+++ b/airtime_mvc/application/models/MusicDir.php
@@ -47,6 +47,7 @@ class MusicDir {
     {
         $dir = new CcMusicDirs();
         $dir->setType($p_type);
+        $p_path = realpath($p_path)."/";
         $temp = $dir->setDirectory($p_path);
         try{
             $dir->save();
@@ -119,6 +120,7 @@ class MusicDir {
     {
         $dir = self::getStorDir();
         // if $p_dir doesn't exist in DB
+        $p_dir = realpath($p_dir)."/";
         $exist = $dir->getDirByPath($p_dir);
         if($exist == NULL){
             $dir->setDirectory($p_dir);
@@ -145,6 +147,7 @@ class MusicDir {
     }
     
     public static function removeWatchedDir($p_dir){
+        $p_dir = realpath($p_dir)."/";
         $dir = MusicDir::getDirByPath($p_dir);
         if($dir == NULL){
             return array("code"=>1,"error"=>"$p_dir doesn't exist in the watched list");