Fixing to use form group ID