Modified fluid-row bug