Moving valves evaluation fix