Hot fix for forms validation