Hotfix Validate component

Fixed some bugs