[QE-417] - Resolved indexing issue inside row handler