Fixed #74 -- Ordering in right direction now.