Added fix for expanded content