More general fix for num_rows
2 files changed