fix ordering bug in last commit