Moving the `if`s inside the fields avoids some issues. Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
Moving the `if`s inside the fields avoids some issues. Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>