fix nil error
test in prod
test in prod