Updated invalid fields handing