Row Number issue fixed