Fixed collapsing issue