ljvillanueva Fixing ordering of records