Fix order lookup