Header bugfix in production mode