Fixed issue with collapsing views