Hotfix/form util