Fix' fix' fix - the order was correct, the partitioning function was not