Fixed bug #89 and remove rows reordering (issue #82).