diff --git a/lib/videojs-resolution-switcher.js b/lib/videojs-resolution-switcher.js
index b7dc282..febb544 100644
--- a/lib/videojs-resolution-switcher.js
+++ b/lib/videojs-resolution-switcher.js
@@ -74,7 +74,7 @@
       this.addClass('vjs-selected');
 
       // Hide bigPlayButton
-      if(!isPaused){
+      if(!isPaused && this.player_.options_.bigPlayButton){
         this.player_.bigPlayButton.hide();
       }
       if(typeof customSourcePicker !== 'function' &&
@@ -370,7 +370,7 @@
 						var _selectPlaylist;
 						
 						if(selectedResolution === 'auto'){
-							_selectPlaylist	= videojs.HlsHandler.prototype.selectPlaylist;
+							_selectPlaylist  = player.hls.selectPlaylist;
 							return _selectPlaylist;
 						}