Added check for PUBLIC_SERVER.