Fix Bug24: Add the D-FlipFlop to the first p,g computation