Fix for wide rows iteration