Row collapse fix