case-3590 - Collapsion fix