Handling static content properly now