[TASK] Intermediate Fix