[ATM][CORE] Hotfix FC