Changed the behaviour for row selection