Fix window row bug