Fixed bug with collapsable features