MEDIUM / Attempt to fix production issues