Fixed handling of static content