FVA bug partially fixed