Temporary fix for 500 server errors.