Make FOC compliant