Removed last row id bug