updated fix when moved rows II