Actually fixed ordering cycle