try to fix ordering bug