fixes issues with collapsable states
Merge pull request #1805 from FinalAngel/develop

fixes issues with collapsable states