Fix to support @FormField