Fix regression bug when creating new forms controls