adjusted for hidden fields