Fix issue with flexible content losing data.