Fixing bug that only reared it's head when I started messing with the main ordering bug