Possible fix for custom content