fix & regression test for issue 355: Row number Issue