Fixes error on cv-form
Merge branch 'hotfix/fixes-cv-form'