fixed collapsable bugs