Apply fix for row limit feature