MEDIUM / Try to fix production issues