diff --git a/tasks/build.js b/tasks/build.js
index c145d2676..63b93e2bc 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -20,12 +20,13 @@ module.exports = function(callback) {
     return;
   }
 
-  // check for right-to-left language
+  // check for right-to-left (RTL) language
+  if(config.rtl == 'both') {
+    gulp.start('built-rtl');
+  }
   if(config.rtl === true || config.rtl === 'Yes') {
-    gulp.start('build-rtl');
-    if(config.rtl !== 'both') {
-      return;
-    }
+    gulp.start('built-rtl');
+    return;
   }
 
   gulp.start('build-javascript');
diff --git a/tasks/watch.js b/tasks/watch.js
index 5bf90b661..444cf966f 100644
--- a/tasks/watch.js
+++ b/tasks/watch.js
@@ -56,12 +56,13 @@ module.exports = function(callback) {
     return;
   }
 
-  // check for right-to-left language
+  // check for right-to-left (RTL) language
+  if(config.rtl == 'both') {
+    gulp.start('watch-rtl');
+  }
   if(config.rtl === true || config.rtl === 'Yes') {
     gulp.start('watch-rtl');
-    if(config.rtl !== 'both') {
-      return;
-    }
+    return;
   }
 
   //console.clear();