Fix blank row issue