Committing fix for server errors.