Compound form names bugfix