Fix expandCascadingContents