Quick fix for #308 for staging server.