Fix for row selection