Fixed select_rows