Fix for content passthrough