Quick fix to support local testing