Fixed expand collapse bug