Fix issue in production deployment