Avoid fail due to postgres ordering