fixed hidden fields issue