diff --git a/dist/jquery.collapsable.js b/dist/jquery.collapsable.js
index 8f329d9..a1817d1 100644
--- a/dist/jquery.collapsable.js
+++ b/dist/jquery.collapsable.js
@@ -6,7 +6,7 @@
  * @copyright Copyright (c) 2014-2017 Radek Šerý
  * @license MIT
  *
- * @version 2.0.5
+ * @version 2.0.6
  */
 ;(function($) {
 
@@ -162,7 +162,7 @@
 
 		// max 1 expanded item
 		if (this.opts.accordion) {
-			defaultExpanded = $items.index($('.' + this.opts.classNames.defaultExpanded));
+			defaultExpanded = $items.index( $items.filter('.' + this.opts.classNames.defaultExpanded) );
 
 			// max 1, we can return now
 			if (defaultExpanded !== -1) {
diff --git a/dist/jquery.collapsable.min.js b/dist/jquery.collapsable.min.js
index f832518..2798279 100644
--- a/dist/jquery.collapsable.min.js
+++ b/dist/jquery.collapsable.min.js
@@ -1,3 +1,3 @@
-/*! jQuery Collapsable 2.0.5 | MIT | Radek Šerý, http://zipper.github.io/jquery.collapsable/ */
+/*! jQuery Collapsable 2.0.6 | MIT | Radek Šerý, http://zipper.github.io/jquery.collapsable/ */
 
-!function(a){function b(){return"ca-uid-"+l++}function c(b,c){var d=[];this.each(function(){var e=a(this).data("collapsable");if(e){var f=e.parent.uid;-1===d.indexOf(f)&&(d.push(f),e.parent[b](c))}})}function d(){var b=this.opts;(this.$extLinks=a(b.extLinks.selector).filter("a")).length&&this.$extLinks.on("click.collapsable",function(c){b.extLinks.preventDefault&&c.preventDefault();var d=a(a(this).attr("href")).data("collapsable");d&&d.$controlLink.first().trigger(b.event+".collapsable",c)})}function e(){var b=window.location.href,c=b.search(/#/),d=-1,e=-1,f=a(a.map(this.items,function(a){return a.$collapsable.get()}));if(!(-1!==c&&b.length>c+1&&(b=b.substring(c+1),-1!==(e=f.index(a("#"+b)))&&(this.items[e].defaultExpanded=!0,this.opts.accordion)))){if(this.opts.accordion){if(-1!==(d=f.index(a("."+this.opts.classNames.defaultExpanded))))return void(this.items[d].defaultExpanded=!0)}else{var g=this;f.each(function(b){a(this).hasClass(g.opts.classNames.defaultExpanded)&&(d=b,g.items[b].defaultExpanded=!0)})}-1!==e||-1!==d||this.opts.collapsableAll||(this.items[0].defaultExpanded=!0)}}function f(){var b=a.Event("init.collapsable"),c=this.opts,d=this.items,e=c.fx;c.fx&&(c.fx="toggle");for(var f=d.length,g=!c.collapsableAll,h=0;h<f;h++)d[h].defaultExpanded?(d[h].expand(b,null,g),g=!1):d[h].collapse(b,null,!0);c.fx=e}function g(){var a=this.opts;"slide"!==a.fx&&"fade"!==a.fx||(a.fxDuration=a.fxDuration||500),"slide"===a.fx?a.fx={expand:"slideDown",collapse:"slideUp"}:"fade"===this.opts.fx&&(a.fx={expand:"fadeIn",collapse:"fadeOut"})}function h(){var c=this;c.id||(c.id=b(),c.$collapsable.attr("id",this.id));var d=[];c.$box.each(function(b){var e=a(this),f=e.attr("id")||c.id+"-ca-box-"+b;e.attr("id",f).data("ca-pre-init-style",a(this).attr("style")),d.push(f)}),c.$control.each(function(){var b,e=a(this);e.is("a")?b=e:(b=e.find("a")).length||(e.wrapInner('<a data-ca-created href="#'+c.id+'"></a>'),b=e.find("a")),b.addClass("ca-link"),b.attr("aria-controls",d.join(" "))})}function i(b,c,d){var e=this.parent.opts,f=this,g="expanded",h=e.classNames.expanded,i=e.classNames.collapsed;"collapse"===b&&(g="collapsed",h=e.classNames.collapsed,i=e.classNames.expanded);var j=a.Event(g+".collapsable",{customData:d,collapsableEvent:c});return this.isExpanded="expand"===b,this.parent.$extLinks.filter('[href="#'+this.id+'"]')["expand"===b?"addClass":"removeClass"](e.classNames.extLinkActive),this.$controlLink.attr("aria-expanded","expand"===b),this.$box.attr("aria-hidden","expand"!==b),e.fx&&"object"==typeof e.fx?this.$box[e.fx[b]](e.fxDuration,function(){f.$collapsable.trigger(j)}):("toggle"===e.fx&&this.$box["expand"===b?"show":"hide"](),setTimeout(function(){f.$collapsable.trigger(j)},e.fxDuration)),this.$collapsable.removeClass(i).addClass(h),!0}var j={control:".ca-control",box:".ca-box",event:"click",preventDefault:!0,fx:null,fxDuration:0,accordion:!1,collapsableAll:!0,extLinks:{selector:"",preventDefault:!1},classNames:{expanded:"ca-expanded",collapsed:"ca-collapsed",defaultExpanded:"ca-default-expanded",extLinkActive:"ca-ext-active"}},k={init:function(a){return new m(this,a)},expandAll:function(a){c.call(this,"expandAll",a)},collapseAll:function(a){c.call(this,"collapseAll",a)},destroy:function(a){c.call(this,"destroy",a)}},l=0,m=function(c,h){if(0===c.length)return null;this.opts=a.extend(!0,{},a.fn.collapsable.defaults,h),this.items=[];var i=this;return this.uid=b(),this.promiseOpen=!1,d.call(this),g.call(this),c.each(function(){var a=new n(i,this);a.$box.length&&a.$control.length&&i.items.push(a)}),e.call(this),f.call(this),this};m.prototype.getExpanded=function(){for(var a=[],b=this.items.length,c=0;c<b;c++)this.items[c].isExpanded&&a.push(c);return a},m.prototype.expandAll=function(b){if(!this.opts.accordion||!this.getExpanded().length)for(var c=a.Event("expandAll.collapsable"),d=this.items.length,e=0;e<d;e++)if(!this.items[e].isExpanded){var f=this.items[e].expand(c,b);if(this.opts.accordion&&f)break}},m.prototype.collapseAll=function(b){for(var c=a.Event("collapseAll.collapsable"),d=this.getExpanded(),e=d.length,f=0;f<e;f++)this.items[d[f]].collapse(c,b)},m.prototype.destroy=function(){for(var b=this.opts,c=this.items.length,d=0;d<c;d++){var e=this.items[d];e.$collapsable.removeClass(b.classNames.collapsed+" "+b.classNames.expanded).removeData("collapsable"),e.$control.find("[data-ca-created]").each(function(){a(this).parent().html(a(this).html())}),e.$control.find(".ca-link").addBack(".ca-link").off(b.event+".collapsable").removeClass("ca-link").removeAttr("aria-controls").removeAttr("aria-expanded"),e.$box.each(function(){var b=a(this).data("ca-pre-init-style")||"";a(this).attr("style",b)}).removeData("ca-pre-init-style").removeAttr("aria-hidden"),e.$collapsable.trigger("destroy.collapsable")}this.$extLinks.off("click.collapsable")};var n=function(b,c){if(this.parent=b,this.$collapsable=a(c),this.id=this.$collapsable.attr("id"),this.$control=this.$collapsable.find(b.opts.control),this.$box=this.$collapsable.find(b.opts.box),0===this.$control.length||0===this.$box.length)return null;this.isExpanded=!0;var d=this,e=this.parent.opts;return h.call(this),this.$controlLink=this.$control.find(".ca-link").addBack(".ca-link"),this.$controlLink.on(e.event+".collapsable",function(a,b){var c=b||a;e.preventDefault&&a.preventDefault(),d.isExpanded?d.collapse(c):d.expand(c)}),this.$collapsable.data("collapsable",this),this};n.prototype.expand=function(b,c,d){var e=this.parent.opts,f=this.parent.getExpanded();if(this.parent.promiseOpen=!0,e.accordion&&f.length&&!1===this.parent.items[f[0]].collapse(b,c,d))return this.parent.promiseOpen=!1,!1;this.parent.promiseOpen=!1;var g=a.Event("expand.collapsable",{customData:c,collapsableEvent:b});return this.$collapsable.trigger(g),g.isDefaultPrevented()&&!d?(!e.collapsableAll&&e.accordion&&this.parent.items[f[0]].expand(b,c,!0),!1):i.call(this,"expand",b)},n.prototype.collapse=function(b,c,d){if(!this.parent.opts.collapsableAll&&!this.parent.promiseOpen&&this.parent.getExpanded().length<2)return!1;var e=a.Event("collapse.collapsable",{customData:c,collapsableEvent:b});return this.$collapsable.trigger(e),!(e.isDefaultPrevented()&&!d)&&i.call(this,"collapse",b)},a.fn.collapsable=function(b){return k[b]?k[b].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof b&&b?void a.error("Method "+b+" does not exist on jQuery.collapsable"):(k.init.apply(this,arguments),this)},a.fn.collapsable.defaults=j}(jQuery);
\ No newline at end of file
+!function(a){function b(){return"ca-uid-"+l++}function c(b,c){var d=[];this.each(function(){var e=a(this).data("collapsable");if(e){var f=e.parent.uid;-1===d.indexOf(f)&&(d.push(f),e.parent[b](c))}})}function d(){var b=this.opts;(this.$extLinks=a(b.extLinks.selector).filter("a")).length&&this.$extLinks.on("click.collapsable",function(c){b.extLinks.preventDefault&&c.preventDefault();var d=a(a(this).attr("href")).data("collapsable");d&&d.$controlLink.first().trigger(b.event+".collapsable",c)})}function e(){var b=window.location.href,c=b.search(/#/),d=-1,e=-1,f=a(a.map(this.items,function(a){return a.$collapsable.get()}));if(!(-1!==c&&b.length>c+1&&(b=b.substring(c+1),-1!==(e=f.index(a("#"+b)))&&(this.items[e].defaultExpanded=!0,this.opts.accordion)))){if(this.opts.accordion){if(-1!==(d=f.index(f.filter("."+this.opts.classNames.defaultExpanded))))return void(this.items[d].defaultExpanded=!0)}else{var g=this;f.each(function(b){a(this).hasClass(g.opts.classNames.defaultExpanded)&&(d=b,g.items[b].defaultExpanded=!0)})}-1!==e||-1!==d||this.opts.collapsableAll||(this.items[0].defaultExpanded=!0)}}function f(){var b=a.Event("init.collapsable"),c=this.opts,d=this.items,e=c.fx;c.fx&&(c.fx="toggle");for(var f=d.length,g=!c.collapsableAll,h=0;h<f;h++)d[h].defaultExpanded?(d[h].expand(b,null,g),g=!1):d[h].collapse(b,null,!0);c.fx=e}function g(){var a=this.opts;"slide"!==a.fx&&"fade"!==a.fx||(a.fxDuration=a.fxDuration||500),"slide"===a.fx?a.fx={expand:"slideDown",collapse:"slideUp"}:"fade"===this.opts.fx&&(a.fx={expand:"fadeIn",collapse:"fadeOut"})}function h(){var c=this;c.id||(c.id=b(),c.$collapsable.attr("id",this.id));var d=[];c.$box.each(function(b){var e=a(this),f=e.attr("id")||c.id+"-ca-box-"+b;e.attr("id",f).data("ca-pre-init-style",a(this).attr("style")),d.push(f)}),c.$control.each(function(){var b,e=a(this);e.is("a")?b=e:(b=e.find("a")).length||(e.wrapInner('<a data-ca-created href="#'+c.id+'"></a>'),b=e.find("a")),b.addClass("ca-link"),b.attr("aria-controls",d.join(" "))})}function i(b,c,d){var e=this.parent.opts,f=this,g="expanded",h=e.classNames.expanded,i=e.classNames.collapsed;"collapse"===b&&(g="collapsed",h=e.classNames.collapsed,i=e.classNames.expanded);var j=a.Event(g+".collapsable",{customData:d,collapsableEvent:c});return this.isExpanded="expand"===b,this.parent.$extLinks.filter('[href="#'+this.id+'"]')["expand"===b?"addClass":"removeClass"](e.classNames.extLinkActive),this.$controlLink.attr("aria-expanded","expand"===b),this.$box.attr("aria-hidden","expand"!==b),e.fx&&"object"==typeof e.fx?this.$box[e.fx[b]](e.fxDuration,function(){f.$collapsable.trigger(j)}):("toggle"===e.fx&&this.$box["expand"===b?"show":"hide"](),setTimeout(function(){f.$collapsable.trigger(j)},e.fxDuration)),this.$collapsable.removeClass(i).addClass(h),!0}var j={control:".ca-control",box:".ca-box",event:"click",preventDefault:!0,fx:null,fxDuration:0,accordion:!1,collapsableAll:!0,extLinks:{selector:"",preventDefault:!1},classNames:{expanded:"ca-expanded",collapsed:"ca-collapsed",defaultExpanded:"ca-default-expanded",extLinkActive:"ca-ext-active"}},k={init:function(a){return new m(this,a)},expandAll:function(a){c.call(this,"expandAll",a)},collapseAll:function(a){c.call(this,"collapseAll",a)},destroy:function(a){c.call(this,"destroy",a)}},l=0,m=function(c,h){if(0===c.length)return null;this.opts=a.extend(!0,{},a.fn.collapsable.defaults,h),this.items=[];var i=this;return this.uid=b(),this.promiseOpen=!1,d.call(this),g.call(this),c.each(function(){var a=new n(i,this);a.$box.length&&a.$control.length&&i.items.push(a)}),e.call(this),f.call(this),this};m.prototype.getExpanded=function(){for(var a=[],b=this.items.length,c=0;c<b;c++)this.items[c].isExpanded&&a.push(c);return a},m.prototype.expandAll=function(b){if(!this.opts.accordion||!this.getExpanded().length)for(var c=a.Event("expandAll.collapsable"),d=this.items.length,e=0;e<d;e++)if(!this.items[e].isExpanded){var f=this.items[e].expand(c,b);if(this.opts.accordion&&f)break}},m.prototype.collapseAll=function(b){for(var c=a.Event("collapseAll.collapsable"),d=this.getExpanded(),e=d.length,f=0;f<e;f++)this.items[d[f]].collapse(c,b)},m.prototype.destroy=function(){for(var b=this.opts,c=this.items.length,d=0;d<c;d++){var e=this.items[d];e.$collapsable.removeClass(b.classNames.collapsed+" "+b.classNames.expanded).removeData("collapsable"),e.$control.find("[data-ca-created]").each(function(){a(this).parent().html(a(this).html())}),e.$control.find(".ca-link").addBack(".ca-link").off(b.event+".collapsable").removeClass("ca-link").removeAttr("aria-controls").removeAttr("aria-expanded"),e.$box.each(function(){var b=a(this).data("ca-pre-init-style")||"";a(this).attr("style",b)}).removeData("ca-pre-init-style").removeAttr("aria-hidden"),e.$collapsable.trigger("destroy.collapsable")}this.$extLinks.off("click.collapsable")};var n=function(b,c){if(this.parent=b,this.$collapsable=a(c),this.id=this.$collapsable.attr("id"),this.$control=this.$collapsable.find(b.opts.control),this.$box=this.$collapsable.find(b.opts.box),0===this.$control.length||0===this.$box.length)return null;this.isExpanded=!0;var d=this,e=this.parent.opts;return h.call(this),this.$controlLink=this.$control.find(".ca-link").addBack(".ca-link"),this.$controlLink.on(e.event+".collapsable",function(a,b){var c=b||a;e.preventDefault&&a.preventDefault(),d.isExpanded?d.collapse(c):d.expand(c)}),this.$collapsable.data("collapsable",this),this};n.prototype.expand=function(b,c,d){var e=this.parent.opts,f=this.parent.getExpanded();if(this.parent.promiseOpen=!0,e.accordion&&f.length&&!1===this.parent.items[f[0]].collapse(b,c,d))return this.parent.promiseOpen=!1,!1;this.parent.promiseOpen=!1;var g=a.Event("expand.collapsable",{customData:c,collapsableEvent:b});return this.$collapsable.trigger(g),g.isDefaultPrevented()&&!d?(!e.collapsableAll&&e.accordion&&this.parent.items[f[0]].expand(b,c,!0),!1):i.call(this,"expand",b)},n.prototype.collapse=function(b,c,d){if(!this.parent.opts.collapsableAll&&!this.parent.promiseOpen&&this.parent.getExpanded().length<2)return!1;var e=a.Event("collapse.collapsable",{customData:c,collapsableEvent:b});return this.$collapsable.trigger(e),!(e.isDefaultPrevented()&&!d)&&i.call(this,"collapse",b)},a.fn.collapsable=function(b){return k[b]?k[b].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof b&&b?void a.error("Method "+b+" does not exist on jQuery.collapsable"):(k.init.apply(this,arguments),this)},a.fn.collapsable.defaults=j}(jQuery);
\ No newline at end of file
diff --git a/package.json b/package.json
index 40d53c0..81ef832 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "jquery.collapsable",
 	"title": "jQuery Collapsable",
 	"description": "jQuery plugin for collapsable boxes",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"author": {
 		"name": "Radek Šerý",
 		"email": "radek.sery@gmail.com"
diff --git a/src/jquery.collapsable.js b/src/jquery.collapsable.js
index 2ec62e4..2da8c1a 100644
--- a/src/jquery.collapsable.js
+++ b/src/jquery.collapsable.js
@@ -155,7 +155,7 @@
 
 		// max 1 expanded item
 		if (this.opts.accordion) {
-			defaultExpanded = $items.index($('.' + this.opts.classNames.defaultExpanded));
+			defaultExpanded = $items.index( $items.filter('.' + this.opts.classNames.defaultExpanded) );
 
 			// max 1, we can return now
 			if (defaultExpanded !== -1) {