Fix FormState