diff --git a/build/angular-bootstrap-select.js b/build/angular-bootstrap-select.js
index 4249982..f40d7fe 100644
--- a/build/angular-bootstrap-select.js
+++ b/build/angular-bootstrap-select.js
@@ -35,21 +35,21 @@ angular.module('angular-bootstrap-select', [])
       require: '?ngModel',
       priority: 10,
       compile: function (tElement, tAttrs, transclude) {
-        tElement.selectpicker($parse(tAttrs.selectpicker)());
-        tElement.selectpicker('refresh');
         return function (scope, element, attrs, ngModel) {
           if (!ngModel) return;
 
           scope.$watch(attrs.ngModel, function (newVal, oldVal) {
             scope.$evalAsync(function () {
               if (!attrs.ngOptions || /track by/.test(attrs.ngOptions)) element.val(newVal);
-              element.selectpicker('refresh');
+              if (element.hasClass('.bs-select-hidden')) element.selectpicker('refresh');
+              else element.selectpicker($parse(attrs.selectpicker));
             });
           });
 
           ngModel.$render = function () {
             scope.$evalAsync(function () {
-              element.selectpicker('refresh');
+                if (element.hasClass('.bs-select-hidden')) element.selectpicker('refresh');
+                else element.selectpicker($parse(attrs.selectpicker));
             });
           }
         };