Fixing problem with selecting rows. Closes #153