fixed prod 500 or 503 error